From b7b375666991d3104718acc4c7b9bcc896949241 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Tue, 7 Feb 2006 11:54:09 +0000 Subject: [PATCH] Fix x86_64 guest console support. Signed-off-by: Christian Limpach --- linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c index 8a3b289131..eaa32d8206 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c @@ -951,22 +951,20 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_VT #if defined(CONFIG_VGA_CONSOLE) - conswitchp = &vga_con; + conswitchp = &vga_con; #elif defined(CONFIG_DUMMY_CONSOLE) - conswitchp = &dummy_con; + conswitchp = &dummy_con; #endif #endif } else { -#ifdef CONFIG_XEN_PRIVILEGED_GUEST extern const struct consw xennull_con; extern int console_use_vt; #if defined(CONFIG_VGA_CONSOLE) - /* disable VGA driver */ + /* disable VGA driver */ ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB; #endif conswitchp = &xennull_con; console_use_vt = 0; -#endif } } #else /* CONFIG_XEN */ -- 2.30.2